refactor: make Epoll take BorrowedFd #2232
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SteveLauC
commented
Nov 27, 2023
| #[repr(transparent)] | ||
| pub struct Epoll<'fd> { | ||
| epoll_fd: OwnedFd, | ||
| _fds: std::marker::PhantomData<*mut &'fd ()>, |
There was a problem hiding this comment.
We cannot use _fds: std::marker::PhantomData<BorrowedFd<'fd>> here or the following code would compile without any issue:
use nix::sys::epoll::{Epoll, EpollCreateFlags, EpollEvent};
use nix::unistd::pipe;
fn main() {
let (r, _w) = pipe().unwrap();
let epoll = Epoll::new(EpollCreateFlags::empty()).unwrap();
epoll.add(r, EpollEvent::empty()).unwrap();
drop(r);
drop(epoll);
}I haven't figured out the reason, but using an invariant type here would work
There was a problem hiding this comment.
Friendly ping @asomers, do you have any idea about this?
asomers
requested changes
Dec 3, 2023
| pub fn test_epoll_add_delete() { | ||
| let epoll = Epoll::new(EpollCreateFlags::empty()).unwrap(); | ||
| let event = EpollEvent::new(EpollFlags::EPOLLIN | EpollFlags::EPOLLERR, 1); | ||
| let fd_1 = unsafe { BorrowedFd::borrow_raw(1) }; |
There was a problem hiding this comment.
Just to get rid of the unsafe, I suggest:
Suggested change
| let fd_1 = unsafe { BorrowedFd::borrow_raw(1) }; | |
| let stdin = std::io::stdin(); | |
| let fd_1 = stdin.as_fd(); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do
Epoll-associated functions takeBorrowedFdso that it is consistent withFdSetandPollFdtest_epoll.rs, use the new APIsChecklist:
CONTRIBUTING.md